Eng: More generic

Copyright©2025 Neil Keleher.
All rights reserved.